Fix keywords list construction to include doc-comment keywords.
Merge pull request #28 from dmakarov/master

Fix keywords list construction to include doc-comment keywords.