Nfcmaster 1

Hi Ben/ Francisco

I addressed all your previous comments.