Merge in of documentation from master branch