Merge pull request #236 from retro-wertz/3ds