paulcuth Merge pull request #10 from justincormack/master