Fixing stupid mistake
Bumping version number
Merge branch 'dev'