Merge pull request #215 from petiepooo/patch-1