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