parse-ms-2

This is an improved version of parse-ms