Merge pull request #148 from wrygiel/okapi

OKAPI Project update (r1031)