Fixed -M option so that it is not always turned on.
Rewrote incomplete measure meter processing.