Merge pull request #1 from benbjohnson/master

Fix Linux build.
gofmt