Cleaning up old code
Merge pull request #30 from cdcarter/master

Cleaning up old code