Merge pull request #3 from james-marsh/master

Additional cleanup
Merge pull request #4 from james-marsh/master

Revert "Additional cleanup"
Merge pull request #2 from vnguyener/master

Why you break build?