Added short circuit var to measure_js to allow for setting it to false
Merge branch 'short_circuit_var', fixes #8