Added support for grouped options. New version. Fixes #11