Merge pull request #69 from andylyall/2014.03

2014.03
Refactor of FirewallSupport