Fixed pathes.
Merge branch 'fix/build' into dev