added more keywords, v1.1.1