Update to version 0.8.0
Resolve merge conflict