sync with 3.0.0 tag
Merge pull request #122 from client9/remotes/trunk

sync with 3.0.0 tag