Fix fill source relative path
Improve include path checking
Merge pull request #1 from c9s/master

Fix fill source relative path