Makefile optimizations
Merge branch 'test'