Merge branch 'master' of https://github.com/BugiDev/smartcard.git/