Pulled common code into base Command class.
Fixed broken Guid to Base36 handling
Minor style cleanup
Minor style cleanup
Merge branch 'master' into cci