Merge with Dinesh's branch

Get new docs and Makefile