EUCA-3399
Merge commit pull request #18 from lwade