Pull request 19 merged