Implemented -n option (including fix for 'detected_cms' bug)