Merge pull request #4 from eswierk/master

More oftest changes