OPAL-1630 - bug fixed
OPAL-1631 - bug fixed
Merge pull request #63 from kazoompa/master

OPAL-1630