Merge pull request #1 from ironicism/pathfinder

Pathfinder
Merge pull request #2 from ironicism/master

Merge pull request #1 from ironicism/pathfinder