Added break
Fixed index
Merge remote-tracking branch 'fork/master'