Merge pull request #135 from apache/documentation-updates