Merge tag '1.0' into develop

tagging 1.0
up version and fix spacing
Merge branch 'release/1.0.1'