After some more experiments
Merge branch 'master' of github.com:b3rnie/zk