added multi choice stuff
Merge pull request #28 from oconn/options

added multi choice stuff