merged pull request #2