path calculation (normal case)
Merge branch 'master' of https://github.com/sunForest/master_thesis

merge remote repo and local repo