Simplify range
Merge pull request #1714 from megawac/range

Simplify range