Merge branch 'setup' into develop
Refactored host address as constant string
Merge branch 'develop' into setup