Cleaning some stuff up
Merge pull request #1 from sjbertolani/master

Cleaning some stuff up