some cleanup
Merge pull request #73 from andreasprlic/master

some cleanup