Updated docs
Improved makefile