Updated version number
Updated version number
Merge branch 'dev'