Merge pull request #3 from jassal/K2

Fixed EDGE-4002
Fixed EDGE-4010