#IMPROVMENT
better option class


git-svn-id: https://plugins.svn.wordpress.org/upprev/trunk@899670 b8457f37-d9ea-0310-8a92-e5e31aec5664