Merge pull request #3 from pkutty/master

TP-16:Merge pull request #2 from pkutty/TP-16-Branch
TP-16: From TP-16 to master branch
TP-16: From TP-16 to master branch
Merge pull request #5 from pkutty/TP-16-Branch

TP-16-Branch changes to master