Improved geometry at junctions
Merge branch 'master' of https://github.com/OTSim/OTSim.git