Edits from SteveH
Merge pull request #48 from rareddy/TEIID-1854

Edits from SteveH