Added proper support for command help