fix issue #24
Merge pull request #26 from poupotte/master

fix issue #24