Now merged from master

Updated docs.