mattcg Merge pull request #9 from sylhare/patch-2