Merge pull request #520 from liuchuangww/user

Typo fix
Merge remote-tracking branch 'upstream/user' into user
Move custom config to custom dir