Completed v2.0
Merge pull request #2 from mcalthrop/feature/v2.0

Completed v2.0