Added more keywords
Merge pull request #251 from chflo/add_keywords

Added more keywords