upd linux code
Merge
upd Makefile
upd engine code
upd