Merge branch 'dev'
updated version file
Merge branch 'master' into dev