changed deprecated min & max to minimum & maximum
Merge pull request #86 from natj/master

changed deprecated min & max to minimum & maximum