Fixes different little problems
Merge branch 'release/0.2.2'
Merge tag '0.2.2' into develop

Minor fixes