Pull request for #303