mattcg Merge pull request #9 from paulhiggs/master