my changes
Merge branch 'master' of https://github.com/rpetti/syncoptions_final_latest1