Merge branch '98-add-ofi-verbs-support' into 'master'

Resolve "Add ofi+verbs support"

Closes #98

See merge request !38