Merge pull request #93 from tomhughes/master