Fix go vet issues
Merge pull request #31 from mattoddie/master

Fix go vet issues