version number incremented
Merge branch 'dev'