Merge pull request #49 from meepingsnesroms/master