minor changes in comments and member handling
Merge pull request #3 from wagnert/master

Replace invalid doc block comments related to WebSocketContainer
merging techdivision
resolving conflicts
Merge pull request #4 from wick-ed/master

minor changes in comments and member handling