Implemented COMP dictionary according to standard (not extended) specification.
Merge remote-tracking branch 'origin/master'