Cleanup?
Merge pull request #4 from iancmcc/feature/testing

Please review branch feature/testing