Resolve bug on issue20
Merge pull request #26 from camael24/b/issue20

Resolve bug on issue #20.