Merge branch 'hotfix/1.0.2'
Fixed locking issue, never return without unlocking.
Bumped version number
Merge branch 'hotfix/1.0.3' into develop