Merge branch 'hotfix/0.2.2'
Fix version number that gets injected
Merge branch 'hotfix/0.2.3' into develop