Merge pull request #1 from liuxinyu95/algoxy

Sync from upstream repo