Re-do of pfsense commit

This is to address issue #177