tweaked to work with gcc and cgo
Merge pull request #1 from DavidVorick/master

tweaked to work with gcc and cgo