Merging Local version.
EDIT: FIXED FOR LOOP