Merge pull request #69 from malmuki/Francois

Francois
-alert :Now working