added changes provided by Andre Gross

added changes provided by Andre Gross