Merge pull request #3 from libretro/master