Final fine tuning … !?

Hi again!

With reference to your previous pull request (ahaerpfer#1), here's what I have now.  If it meets your expectations, I'd be very glad if this would find it's way into *master*.  Issue #28 could then be closed, too.

Thanks and all the best.
-Andi