Pull request for Issues/52