Merge branch 'release-0.1'
Named the simpit config file to the correct name
Merge branch 'master' into develop