merged pull request #3