merge upstream changes
merge upstream changes
use Pathname to determine full path of relative path includes
Merge pull request #17 from madAndroid/master

Use pathname to discover full path for relative path includes