Merge pull request #42 from orbea/debug