Add keyword and plural support.

This fixes #10