added comment type to tokenType, issue #18