Improve route class
Merge remote-tracking branch 'pagon/master'

Conflicts:
	README.md