Updated keywords. Closes #6.