Merge pull request #3 from vicamo/bugzilla/916863/nfc-emulator