bug fixes
Merge pull request #74 from malmuki/Francois

bug fixes