Putting column indeces in an ivar
Merge remote-tracking branch 'patrick/master'