OPAL-1634 - bug fixed
Merge pull request #64 from kazoompa/master

OPAL-1634