Improved sync issues
Merge pull request #2 from kR105/master

update with upstream changes