Fixed type on keywords
Updated some comments
Bumped version