cleanup
Merge pull request #1 from jamesward/master

Cleanup