Merge pull request #62 from orbea/debug