merge pull request #189