Merged pull request 434