added int z
added int k
Merge branch 'master' into 423