Revised document for release 0.6.1
Merge branch '0.6-develop'