Code

spring cleaning of contrib directory from andreas