matthewmueller Merge pull request #3 from jimmywarting/patch-1