Merge pull request #43 from fetzerch/debugfix2