Pull request for 0.8.0