@yarondbb 
already commited a new changes , just saw your comments
please check a new code
will think about 'smart' solution :)