Close #161 - Add support for optgroups