dave-tucker Merge pull request #86 from lolPants/master