Merge pull request #1 from shawnps/master

gofmt -s