alexford Merge pull request #10 from Cohen-Carlisle/oo-is-bs …