pulled choice and variable into searchspaces namespace
Merge pull request #17 from Qwlouse/master

pulled choice and variable into searchspaces namespace