Refactore i-router
Merge pull request #76 from wtfil/refactor-i-router

Refactore i-router