hard coded IP and PORT
Merge branch 'adam'