fix notations
Merge branch 'develop'
Update Documents