Merge pull request #63 from kazoompa/master

OPAL-1630
OPAL-1634 - bug fixed