Merge pull request #99