Set addr based on the addr option
Merge pull request #30 from grahamc/patch-1

Set addr based on the addr option