Merge pull request #22 from spowers/master

shortest path fixes