Added min/max size options
Merge branch 'minmax'

Merging min/max-size options into master branch
code cleanup