Initial commit for SharkServer2
Address some feedback from PR 223
Merge pull request #223 from hw3/hive0.11

Initial commit for SharkServer2