Merged pull request #2 from tomhughes/master.