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