Pull request for issue #4

This patch should be backward-compatible so users can optionally pass in an `Addr` value and that will be used where possible within this library.