Merge pull request #22 from poupotte/master

Debug
fix issue #24