Merge pull request #390 from tejones/master

teiiddes-1882