OPAL-1627 - fixed
Merge pull request #62 from kazoompa/master

OPAL-1627