Merge tag '1.0.2' into develop

1.0.2
Cleanup of code
Bumped version numbers
Merge branch 'release/1.0.3'