Fixed some bugs in the index numbers, some groups had the same index numbers!
Merge remote-tracking branch 'greengroup/pr/45'

Closes #45