Added Router functionality
Merge branch 'master' of https://github.com/sudhanvagn/zxbcn34567BB