Pull 0.8.0 branch to master