Merge pull request #328 from LuffyWang/next

[Contact] Fixed some issues.