Merge pull request #13 from janLo/master

Some improvements regarding the route planning