Merge pull request #161 from COPPER-BOBCAT/staging

Staging
added comments in server code
Merge pull request #164 from power9/master

added comments in server