Simplified startup procedure.
Merge branch 'master' of https://github.com/wouterbeek/Beekeeper