Merge pull request #126 from orodley/max-min