Merge pull request #118