Merge branch 'hotfix/better_custom_dashes'
Merge branch 'release/0.2.7.1'
Few fixes after losing data in main laptop
Merge branch 'hotfix/0.3.0' into develop