small changes before branching out
Merge branch 'master' of https://github.com/gislifreyr/ready-steady-go