Merge pull request #7 from tkrille/master

OCFJ-17