added config options as suggested in #9