OPAL-1443 - Enhancement completed
Merge pull request #70 from kazoompa/master

OPAL-1443