Issue 17 - done
Merge pull request #18 from unixod/feature/17-routers-elimination

Issue 17 - done