Updating boilerplate
Updating makefile