Code

Updated samba handling