Pull request for #22