Improve emulate command
Merge pull request #589 from Icenium/fatme/improve-emulate

Improve emulate command