Adding back in keywords.

 Yes, I'm your hero, @algernon
Merge pull request #193 from paultag/paultag/feature/keyword-calls

Adding back in keywords.