fixes #82. Split the config options in 2 options and made it backwards compatible