Try debugging the situation
Merge pull request #316 from Lerogero/master

Try debugging the situation