Merge pull request #5 from andrewhassan/master

A bunch of changes
.