Added ability to turn off short circuiting.
Merge branch 'master' into jcute