Version 0.8.7
Merge branch 'master' into development