fixed bug in operator_type enum & commented out infinite loop
Merge branch 'master' of https://github.com/nickjyee/projects