3.0.0 to 3.0.3
Merge pull request #2 from clovery/master

3.0.0 to 3.0.3