Merge pull request #113 from phantomjinx/master

Couple of commits