Finally validating operands properly...i hope
Merge pull request #100 from Ricky1833/master

Finally validating operands properly...i hope