Added citation
Merged makefile