Added and updated keywords
Merge pull request #7 from gschandler/master

Added and updated keywords