Fixed reversed locking condition
Finished release 1.0.8 (merge into develop)
Merge branch 'develop'