Merge pull request #55 from tomhughes/master