Added minmax
Merge branch 'minmax'