Fix Version number and clean code
Merge branch 'master' into develop