server merge fix
Merge branch 'master' of https://github.com/nishant-jain/Middleware-dev