Update from BTC
Clean up documentation
Update documentation
Merge branch 'release/0.6.0' into develop