Merge pull request #138 from tanmaykm/tanmaykm

multiple deployment and stability fixes