Added client address detection.
Merge origin/master
Removed unused import.