Let there be mario!
Merge pull request #15 from Centralan/master

Let there be mario!