#106 made it more configurable

This should also solve #131