shabbychef Merge pull request #9 from lrnv/patch-1