Fixed makefile return.
Fixed makefile return.
Merge branch 'test' into dev