Fixes #226
Merge branch 'master' of github.com:aheinze/cockpit