Cabalization
Merge pull request #2 from Zert/cabalized

Cabalization, courtesy of Zert