merge
modify the import
fix compile error
Merge pull request #666 from youyong205/master

modify the default config