small
fixed conflict
Merge branch 'master' of github.com:iliastsangaris/Argos
getting addresses
fixing merge conflicts