Merge pull request #1 from KR-Infotech/master

integrate changes
Merge pull request #2 from KR-Infotech/nicholas

Merge pull request #1 from KR-Infotech/master