Add spec and modify Makefile