Merge pull request #598 from neheb/oon2