Merge branch 'hotfix/0.1.3'
Merge branch 'release/0.2.0'
Merge branch 'release/0.3.0'
Fix unit conversion
Merge branch 'hotfix/0.3.1' into develop