Merge pull request #2 from Fnoopix/master

Fixing reviewlette
here you go
Added some fun stuff