Merge pull request #26 from libgo/code-read

A few minor tweaks.
Merge branch 'master' of https://github.com/niemeyer/gopkg