snarez/voltron — pull request #51 by richo (2014-03-25 09:33:40+00:00)
Title: Fix missing self

plz2merge

I accidentally broke universe