Merge pull request #1 from pythoncn/master

merge changes from base
fix a typo in _settings.py
Merge pull request #56 from crackcell/master

fix a typo in _settings.py