Keywords update
Merge pull request #45 from lordrasmus/pull-upstream

Keywords update