OKAPI Project update (r1055)
Merge pull request #150 from wrygiel/okapi

OKAPI Project update (r1055)