Fix bug

Fix debug output
Small changes
Merge pull request #8 from edwinofsakh/test

Some changes
Merge pull request #9 from edwinofsakh/master

Add to master