Merge pull request #36 from kevinearls/ENTESB-1792