Switch to master
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Fix shell commands
Fix some stuff
Switch to develop