make install much easier
Merge branch 'master' into job