Simplify command checks to remove redundant function calls.
Add 'r' option for reload.
Merge pull request #675 from Kinematics/4.1-dev

Simplify command checks to remove redundant function calls.