first part of #119 merged by ggrnd0
second part of #119 merged by ggrnd0
remove relative path
fix file rename
Merge branch 'master' into newResolving
next working on resolving - context next