ticket:14 fixed non-global paths
Merge branch 't14_global_path'