Added Range support
Merge branch 'experimental'