Make compatible with go version 1. Also formatted with gofmt
Merge pull request #9 from ryanchapman/master

Make compatible with go version 1. Also formatted with gofmt