Merged own patch for the bug #391 (debugging and comments mostly).
8 files changed