server part2
Merge pull request #3 from nodik/part1

server part2