Updated copyright, fixed bug in makefile