Merged pull request 325