Merge pull request #155 from bsuh/master

Herp derp cosmetic fixes