fixes #10 golinted things
Merge branch '10-golint'