Improve setup of default options
Improve setup of default options

nlemoine/papi,isotopsweden/wp-papi,nlemoine/papi,isotopsweden/wp-papi,wp-papi/papi,nlemoine/papi,isotopsweden/wp-papi,ekandreas/papi,wp-papi/papi,ekandreas/papi,wp-papi/papi,ekandreas/papi