added -j 4 to make  commands
Merge branches 'dev' and 'master'