Merge pull request #1 from bozanarh/feature1

Santo's first commit
Prasanna's 1st commit
Prasanna's 2nd commit