Merging pull request #185