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