Merge pull request #396 from ccding/master

gofmt for ./server ./test