Manually merged pull request 458
Merge with master