David Colmenero Jimenez aka D_Skywalk <dantoine@gmail.com>

 based on Samba & ma_muquit@fccc.edu changes 