Merge remote-tracking branch 'mjesec/rfid-vm'