Merge pull request #19 from sjsrey/master

Cleaning up