Merge pull request #9 from smartinmedia/develop

bugfixes