Modified
Added server sample
Merge changes