Merge pull request #3 from joemcl/joemcl-patch-3