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

TP-16-Branch changes to master