Merge pull request #175 from MonsieurNicolas/better_sync

Performance improvement when catching up