Updated docs to latest from code
Updated to latest from master