Merge pull request #1 from gavrielk/master

Work branch update after adding KW support