Merge branch 'master' of github.com:h-enk/doks