Merge branch 'dev'
Updating version number.