Merge pull request #177 from jy95/create-pull-request/patch

Merge pull request #177 from jy95/create-pull-request/patch #152