Merge pull request #112