Make compatible with go version 1
Merge pull request #5 from ryanchapman/master

Make compatible with go version 1