Merge pull request #19 from apache/gsoc-2021-and-manual-update