Reworking path logic
Merge pull request #11 from areynold/Version02

Reworking path logic