Merge pull request #4 from ebenezergraham/patch-1