Merge pull request #28 from pstch/develop

Switch from try_calling to call_if (semantics changed)