Merge pull request #104 from naveenhooda2000/develop

Develop
fixed the failing tests