Merge pull request #1 from divshot/master

3.0