Fixed a few things
Merge branch 'pr/53' into butterflyknife
Merge pull request #4 from alexweissman/butterflyknife

Butterflyknife