Merge pull request #194