Fixed a bug on --logo option parsing.
Fix a bug on CM detection caused by 9b929d18e43436138d15512e6a5e0855d7a30800.