Removed unneeded define, made lack of arguments consistent.
fixed the memset not setting the entire operation table to null.
Merge remote-tracking branch 'origin/master'