Make compatible with go 1.1
Merge pull request #3 from ncw/go1.1compatibility

Make compatible with go 1.1