i-router refactoring
Merge pull request #82 from wtfil/i-router-refactoring

i-router refactoring