Merge pull request #331 from lynxis/rb_smcroute