Adjusted to support greater range
Merge branch 'release/v1.0.2'