fixed #5
rm PyCharm files
Merge branch 'dev'