update start script
Merge remote-tracking branch 'spa/master'

Conflicts:
	main.rb
Merge remote-tracking branch 'spa/master'
Merge remote-tracking branch 'jeko/master'
bugfix