basic operator fixes
move class out of useless wrapper function
Merge pull request #10 from carrot/patch1

basic operator fixes