added int k
Merge branch 'master' into 423
local changes??