Makefile opt.
Merge branch 'test'