Merge pull request #538 from SatishTalim/master

commit - update
Merge pull request #539 from SatishTalim/master

commit - update
commit