Patch 2

Hi
New pull request (slightly changed) based on your message.

Kind regards

Mario