Fix condition bug
Change version to 2.0.2
Merge branch 'master' into dev_v2