some more cleanup
Merge pull request #5 from LudoTheHUN/v1

some more clean-up before release