Merge pull request #30 from meepingsnesroms/master