solve conflicts with different versions
upload after mess up with branch and master
Merge pull request #6 from jdammers/preproc_new

Preproc new