Merge pull request #62 from kazoompa/master

OPAL-1627
OPAL-1630 - bug fixed