Merge pull request #24 from lukedirtwalker/oomodel_enhancements

Oomodel enhancements