This addresses the range check issue and closes #82 (closed). This merge should happen after !68 (merged)