improve the build, now time pmake should work as it is as long as the user have omake installed
Merge remote-tracking branch 'upstream/master'