Merge pull request #10 from jladuval/master

Fix to client#sync
updated packages, merged with upstream