Merge pull request #5 from mdavy86/cleanup

Cleanup