Modifications by Jan Rach

http://board.vacc-sag.org/42/51952/#post657651