Merge pull request #153 from mdrillin/master

TEIIDDES-1654