Few more changes. Added makefile