initial changes
refactoring
complete address
Merge branch 'master' into develop
test