refactored Map to Router
Merge branch 'master' of github.com:pce/mellon