Minor refactoring
Some bug fixes
Merge branch 'master' of github.com:callista-software/dynamic-routing-gateway