Fixed address function, had some variable issues
Merge pull request #2 from barnabyalter/master

Fixed address function