Merge pull request #377 from pcercuei/libretro