Version bump
Merge branch 'dev'