Fix issue #35
Merge pull request #36 from looping/debug

Fix issue #35