Merge pull request #5 from daven009/master

Router updates
Merge pull request #6 from daven009/master

Updates on conversation module
Merge https://github.com/ycswaves/yamatoV09