Spring Cleaning
Merge pull request #4 from mrpozzi/master

Spring Cleaning