bugfix
Merge pull request #23 from joergwin/master

bugfix + cleanup