Merge pull request #589 from Qwinix/master

Addressed: #586 & #588
commit
Merge pull request #591 from SatishTalim/master

commit - minor
commit
Merge pull request #592 from SatishTalim/master

commit - MINOR
updated issue from 388 to 391
Merge pull request #392 from Qwinix/issue_388_to_391

Issue 388 to 391