Completed v1.0
Merge pull request #1 from mcalthrop/feature/v1.0

Completed v1.0