Merge pull request #39 from makinacorpus/stable

Stable
shorewall consistency pass