Merge pull request #153