Merge branch 'release/0.2.6'
Fixed bug with route changes