Assertions and makefile added