tweaking
merging master
Merge pull request #66 from elyotli/keyword-play

Keyword play