Merge pull request #48 from penyaskito/patch-3