Merge pull request #507 from bhariharan/unstable23

Merge branch 'unstable' into unstable23
Make radio button setup override able
Merge pull request #508 from bhariharan/unstable

Make radio button setup overrideable
Merge branch 'unstable' into unstable23