Merge pull request #60 from malmuki/Francois

Francois