Removed short-circuit evaluation potential.
Merge pull request #3 from CodeShark/no_short_circuit_eval

Removed short-circuit evaluation potential.