Remove newlines
Merge branch 'develop'
Merge branch 'develop'
Fix bug with switcher
initial version
Add name