Touch up on debugging
Closer on debugging
Merge pull request #32 from jamrootz/source

Closer on debugging