bump version
Merge branch 'dev'