Fixed Makefile
Improved performance for Issue