merged pull request #52