Yes it certainly seems better than status quo. Thanks for the contibution - merged and published in 1.1.0.