Merge branch 'upstream'
Bump version to 1.0.0
Merge pull request #114 from tpkelly/master

Bump version to 1.0.0