various fixes
fix doc
Merge pull request #240 from will123195/3.0

3.0