Merge branch '6-fix-index-assignment' into 'develop'

Resolve "Fix index assignment"

Closes #6

See merge request !8