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