Merge pull request #42 from milneti/master

Pull from Master to T-Branch
Merge pull request #45 from milneti/T-Branch

Merge pull request #42 from milneti/master