Merged Abhinav's updated documentation into master.