Code review from Luke - efficiency++
Merge pull request #6 from matthew-andrews/better-sync

Code review from Luke - efficiency++