added tests and demo
Merge branch 'ajsut-and-demo' into develop
bumped version number to 0.2.5
Merge branch 'release-0.2.5' into develop