Router changes
Merge pull request #14 from raulmacarie/mircea

Router changes