mix max
Merge pull request #19 from SirHound/time-scale

mix max