Merge pull request #1 from snkismKurian/master

server retakes