Merge pull request #160