Upgraded version
Merge origin/master

Conflicts:
	config.xml
Merge origin/master

Conflicts:
	config.xml
Touching up spots