Release 0.8
Merge branch 'master' into develop