Update address.rb
fix merge conflicts
merge closes #95