Merge pull request #2 from libretro/master