merged pull request #12