Update for Go Lang support
Merge pull request #20 from cnivolle/patch-1

Update for Go Lang support