Updated iterator
Merge branch 'row_major' of github.com:pakozm/april-ann into row_major