Minor refactoring
Merge branch 'master' of https://github.com/kvetak/RINA

Conflicts:
	README.md