Merge pull request #25 from milneti/master

Update local branch
Merge pull request #31 from milneti/T-Branch

Update Local Branch