Flexibility

Adds flexibility to SimpleController
-- Previous commits failed for some reason
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md