Pull request for #401