Pull request 317 merged