Bug hunt V: Comodifcation edition!
Merge pull request #1 from LazDude2012/master

.