keywords implementation change
remove unnecessary tuple/list
remove unnecessary ordering
Merge pull request #32 from trblae/master

keywords implementation change
Merge pull request #1 from xiaoxu193/master

Updating from upstream