Fix a mismatch between declaration and definition
Merge pull request #185 from g-oikonomou/bug-fixes/cmd-handler-fix

Fix a mismatch between declaration and definition
Merge remote-tracking branch 'upstream/master'