2.0 updates
Merge pull request #2 from dbashford/2point0

2.0 updates