changes according to mail from tolk (2014-11-25 11:31)