Updated.
Added new keywords.
Added new tests.