Removed unnecessary minimum/maximum computation
Merge origin/master