Issue #210

also: optional ignore passcode fix