First pass at implementing Ranges
Fixed some issues with Range, should work now
Merge remote-tracking branch 'origin/master'