Merge do pull request #90

Merge do pull request #90