Updated parser.

Now parses both the individual time steps as well as the union of all steps in a
time window.