after Rob's suggestion
Merge branch 'master' of github.com:siliconsoi/hedgehog