Merge pull request #72 from greatgautam/develop

Training-36