Pull request for #5