updated version number
Merge branch 'dev'