Merge pull request #4 from intalio/K2

K2
Code enhancement related to WF-1604, and code corrections to fix WF-1602
Merge pull request #53 from bapiraju/K2

code enhancement related to WF-1604, WF-1602