More attempts to fix it
Merge pull request #104 from lremedi/master

More attempts to fix it