final split up and work merge
Merge pull request #7 from nealcpeters/routing

final split up and work merge