Merge pull request #46 from plmday/master

Fix #45.
Improved debug information