Pull request merge #61