3.0 upgrade
Merge pull request #10 from davestum/3.0

3.0 upgrade