Merge pull request #8 from kermie/master

take over changes by @acpi
took over changes by @acpi from http://forum.oxid-esales.com/showthread.php?t=16297&page=8#post119141
Merge pull request #1 from OXIDprojects/master

take over changes by @acpi