add cpp keywords
better diagnistics output
Getting keywords from directory
Merge remote-tracking branch 'origin/master'