Merge pull request #72 from manishsongirkar/foundation-5

Minor Fixes in Backend