Added donut options to configuration
Added Test for Donut options
Merge branch Donut option into develop