In reply to Milen Petrinski.

Any improvement PR is welcome!