Merge pull request #2 from flerda/v2.1-dev

Update 2.1 branch from flerda
Merge pull request #4 from flerda/v2.1-dev

Catch up merge from flerda into 2.1
Merge pull request #5 from flerda/v2.1-dev

Catch up merge from flerda into 2.1
Fixed version to match latest released alpha
Bumped version to 2.1alpha2
Merge pull request #8 from flerda/v2.1-dev

Catch up merge from flerda into 2.1
Options group management