save the address first
Merge pull request #2 from tallkeith/save-first

save the address first