Push to 0.8.8
Merge branch 'master' into dev
Fix version 0.8.7