merge in pull request #228