Refactor of FirewallSupport
Merge pull request #73 from andylyall/2014.03

Refactor of FirewallSupport