Merge branch 'amaranthrose-master'
doc fixup
test app
Merge pull request #3 from vmotsak/master

update to have tests