Bug fixes + Makefile
Merged