ZP-671 Changes recommended by Manfred. Released under the Affero GNU General Public License (AGPL) version 3.