Merge pull request #597 from neheb/oon