Added config options. #8
Resolved merge.
JSON mistakes.
Resolved merge.
JSON mistakes.
Resolved merge.