Align spacing between commas
Add more keywords

Related to #11.
Merge pull request #58 from yous/patch-keywords

Add more keywords