Merge pull request #3 from tkrille/master

ITs for OCFJ-17