Merge pull request #1 from misprintt/master

Sync with origin (3.0.0)