Merge pull request #95 from apache/fix-go-18