Merge pull request #9 from smartinmedia/develop

bugfixes
Merge pull request #10 from smartinmedia/master

Merge pull request #9 from smartinmedia/develop