Merge pull request #39 from jonfaustman/develop

1.0.0
Merge pull request #45 from jonfaustman/develop

1.1.0
Fix #47.
Merge branch 'master' into develop