Fixed conditional
Version bump
Merge branch 'release/1.0.3' into develop