Merge pull request #49 from WouldYouKindly/support-path