Move fpath
Merge branch 'master' into zaalbar
Fix makefile
Merge branch 'master' into zaalbar