Merge pull request #999 from franckstauffer/master

Some fixes