Small code polishing in emulator code
Merge pull request #41 from telerik/totev/fix-emulators

Small code polishing in emulator code