Bugfix/option group labels #35

Merged
merged 2 commits into from Oct 10, 2012