Set addr based on the addr option
Create a trigger_start option for disabling starting on install
Merge remote-tracking branch 'origin/patch-1'