Enhancement: added per suggestion from @rmehner