Merge pull request #42 from milneti/master

Pull from Master to T-Branch