Pull request #168