Merge pull request #1 from gavrielk/master

Work branch update after adding KW support
Merge pull request #2 from gavrielk/work

Merge pull request #1 from gavrielk/master