Fix for Issue #45

Make undesirable behavior opt-in.
Merge pull request #54 from Muzical84/master

Fix for Issue #45