onsi Merge pull request #6 from sneal/go1.16