resolves #46 by adding ms and s time units.