Merge pull request #389 from wcwang/ivi

Fixed NFC and SE implementation issues.