Twaek Makefile, more build options
Improved Makefile, for optimization
Bug fix