Handle records wrapping
Merge pull request #164 from tlvince/refactor/sync-row

Handle records wrapping