Merge pull request #73 from malmuki/Francois

Francois
bug fixes