Add an option for easily avoiding deadlocks in matrix use

Add an option for easily avoiding deadlocks in matrix use #90