Merge pull request #15 from cesarramirez/debug

Looks awesome here.
Merge branch 'master' into debug