Minor comments correction
v2.3.0
Moved cmp
...