wfyson Merge pull request #3 from dennmuel/patch-1