update
Merge https://github.com/surajvijayan/GENERIC_SERVER
Update