cleanup
Merge branch 'release/0.8.0'