Merge pull request #1 from jakeoverall/master

Merge pull request #38 from eanplatter/master