Keep zk branch simple as possible
Merge branch 'zk' of github.com:qoopooh/b-sec into zk