Merge branch 'rc0.3.0' into develop
cleaned code with cond instead of nested ifs
Merge branch 'feature-cond-instead-of-nested-if' (v0.3.1)