mfaruqui Merge pull request #5 from bothameister/patch-1