Fix for Issue #45

Make undesirable behavior opt-in.