Cleanup
Merge pull request #2 from lrqdo/cleanup

Cleanup