Merge pull request #218 from will123195/3.0

3.0
upstream