I'm not so sure about this change
Merge pull request #1 from cofauver/michaels-change

Michael's Controversial Change