fixed else bug
Merge branch 'master' into v0.2
Merge branch 'v0.2' into v0.3