fixed some unit tests
bumped the version number
Merge branch 'dev'