Attempt to remove hard dependency on OC

Let's try some @Optional
Merge pull request #29 from mallrat208/master

Attempt to remove hard dependency on OC Fix #26