Merge in latest.

Merge in latest changes from my development branch into the main SyncFree repository.