updated emu

updated emu
Merge pull request #86 from ravedragon/master

updated emu