The debugged version
Merge pull request #7 from xjaros1/master

The debugged version