Nyan
Merge pull request #1 from Bemmu/master

Thanks for the ride yesterday! :)