Merge pull request #113 from meepingsnesroms/master