pls. take over changes by @acpi

Hi Shaun, please take over the changes by @acpi according to this forum post:
http://forum.oxid-esales.com/showthread.php?t=16297&page=6#post118736