TCP register
Adding defaults using environment variable
Merge remote-tracking branch 'origin/master'