Merge pull request #70 from malmuki/Francois

-alert :Now working
fast bug fix