Hehe
Merge pull request #3 from bongobonga/master

Hehe