Merge branch 'master' into em

Conflicts:
	main.rb