Merge pull request #56 from tomhughes/master