Added server and docs
Merged changes