Bugfix
Merge pull request #3 from dcmoore/release-1.0

Release 1.0
Merge branch 'master' into develop