Cleanup
Merge pull request #53 from GrahamCampbell/master

Cleanup