Merge pull request #15 from roomorama/cleanup

Cleanup