Merge branch 'master' of https://github.com/ungerik/go-start

iooo
poen
Merge remote-tracking branch 'origin/master'