jewel Merge pull request #53 from onionjake/patch-1