More Go idiomatic code
Merge pull request #12 from satori/master

More Go idiomatic code