Merge pull request #138 from mpeuster/master

Cleanups, improvements to debug chaining problems