Merge pull request #2 from pkutty/TP-16-Branch

TP-16 branch-Latest Pull request
TP-16: From master to TP-16 branch
Merge pull request #3 from pkutty/master

TP-16:Merge pull request #2 from pkutty/TP-16-Branch