updated makefile
updated docs
Merge branch 'develop'