Merge pull request #2 from intalio/K2

K2
Merge pull request #4 from intalio/K2

K2
Merge pull request #5 from intalio/K2

K2
Fix for PXEI-910
Merge pull request #66 from jassal/K2

K2