Merge pull request #32 from daven009/master

Merge & Updates
Updates

router