merged pull request #15