Support for keywords
Merge branch 'master' into gh-pages
Compile support for keywords