Fix
Merge pull request #1 from marazmiki/master

Fix internal error, added logginx, pep8 code