modified two files
Merge branch 'master' of https://github.com/Jythoner/pycharm