Now yes! Addes master password funcionality