Merging pull request #183