Cleanup of code
Bumped version numbers
Merge branch 'release/1.0.3'
Merge tag '1.0.3' into develop

1.0.3