Merge branch 'master' of https://github.com/egjensen/go
Merge branch 'master' of https://github.com/egjensen/go