Start with 1-based arrays instead of 0-based
Merge remote-tracking branch 'origin/master'