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

Cleanup
Merge pull request #3 from cinovo/master

merge