new modifications
integrated router
Merge pull request #13 from raulmacarie/mircea

Mircea