Merge pull request #515 from pruiz/syswebrouting-fixes