new version: 3.0.0
Merge remote branch 'upstream/master'