Merge pull request #319 from nmav/oc-iface