hjwp Merge pull request #2 from dbieber/patch-1