3.0 upgrade
Merge pull request #109 from cjemagid/3.0

3.0 upgrade