Minor changes.
Merge origin/master
Merge origin/master
Changes to socket framework.