Added server part
Merge branch 'nilov'