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