Merge pull request #130 from Randgalt/zk3.3.x

version 1.0.17