added -M option