Merge pull request #11 from wjdix/master

Break Server Behaviors Apart and Build Up With Composition