ISSUE #20 - Refactoring of routing and some general bug fixes
ISSUE #20 - Fixed more routing problems