Updates dijkstra
Merge branch 'origin/master'