Bugs fixed, see issue #1 and #2. PEupd file updated.