Fixing bugs at server side
Merge branch 'master' of https://github.com/irah-000/remotug