fixes #28
Merge branch 'ofp_desc_fix' into devel-0.5