palmiak Merge pull request #3 from olawanlejoel/patch-1