Merge pull request #160 from Jason-Cooke/patch-1