merged pull request #6