relativize
resolve
Merge pull request #267 from patriot1burke/master

relativize and resolve