Use addr to specify address

This patch is based on https://gist.github.com/kazeburo/d9f2e5d9dfe93798aa84 (cc: @kazeburo)