Merge changes from issue #10
Call FolderSync