made it more configurable. More details in CHANGELOG ENTRY 1