Adds keyword support

Closes #10