settings switch implemented
Merge remote-tracking branch 'origin/v.0.0.1' into v.0.0.1

Conflicts:
	.idea/workspace.xml
should work