merged pull request #269