merged pull request #29