Merge pull request #612 from neheb/ool