Fixed #1
Added default option to custom fields