Merge pull request #64 from orbea/debug