Merge branch 'feature-cond-instead-of-nested-if' into develop (v0.3.1)
shortened explanation
Merge branch 'develop'