COFH core update

Fixes crashes.
Merge pull request #26 from vanityset/master

COFH core update