Commits for javierav

All javierav commits (2)

Cleanup duplicate codehanami
Fix typo in READMErouter