small fix - idx++ is already in for
Merge remote-tracking branch 'origin/master'