Fixed automatic versioning
Merge branch 'dev'