Merge pull request #111 from tomhughes/master