Adjust lookup function to use Int indices
#63
+8
−1
Merged
Int indices
#63