small changes
rewrite mockapp using library
Merge pull request #87 from DIdiHL/mia

Mia