merge pull request #49