Hello,

I am sending version 2. I made proposed changes and verified it builds and works.

Please, re-review.

Tomáš