Few fixes after losing data in main laptop
Merge branch 'hotfix/0.3.0'