PyCharm 3.0.0
Merge pull request #1119 from NanoXD/master

PyCharm 3.0.0