Merge pull request #106 from tomhughes/master