Improved Makefile
Fixed for checking immediate properties