fixed bug introduced by weird merging
removed README.md~
Merge branch 'master' into leica_cl