Merge pull request #2 from kckane/master

Updated synchronization fix to build master