added ajsut tests
Merge branch 'ajsut-tests' into develop
bumped version number to 0.12
Merge branch 'release-0.12'