Adding missing keywords

Signed-off-by: Mikael Henriksson <mikael@zoolutions.se>
Merge pull request #32 from mhenrixon/master

Adding missing keywords