fixed dos2unix
Merge branch 'master' into develop