Merge pull request #183