Merge pull request #40 from fetzerch/debug