Fix
Merge pull request #2 from Birdback/cleanup

Cleanup