Adding to changelog and updating makefile