Updated documentation for v0.9.6 & Makefile consolidation