Merge pull request #2 from ksgush1/development

Merge pull request #1 from ksgush1/master
Merge pull request #3 from ksgush1/master

Merge pull request #2 from ksgush1/development