tonghuix Merge pull request #307 from Hagb/sync-4