no need to inspect the block if the functionality is disabled in the system config
if the visitor has previously selected a shipping method, don't override it
Merge pull request #2 from aligent/master

Minor improvement and don't override customer's selected shipping method