Merge pull request #5 from mathieudesro/master

Improve code stability
Merge pull request #6 from mathieudesro/master

Improve code stability