Fixing DS-875 and DS-870
fixing DS-876
Merge pull request #4 from chanikag/master

Fixing DS-875 and DS-870