Fixed a bug and added a missing file. This is still a full package.

Thanks to mumme in the forum for the bug report.

More...