putting in a correct version number
Merge branch 'master' into dev