fix issue#113
fix issue#193
fix issue#185
fix issue#187
Merge pull request #211 from vaibhavcisin274/sivanand

Sivanand