Made a minor change to Dijkstra
Merge branch 'master' into tests