Constructor editted, makefile added