Clean up
Merge pull request #12 from ryandorey/master

Clean up