Merge branch 'hotfix/0.1.1'
Merge branch 'develop'
fix reloading after the first time
bump version
stuff