Corey - 2011-11-24

Patch vs revision #69