merge latest changes from larsch/ocra