96 short circuit and flow

https://github.com/kfgodel/diamond/issues/96