Merge pull request #2 from cinovo/master

merge back
cleanup :)
Merge pull request #12 from michaelwittig/cleanup

Cleanup