Merge pull request #16 from opi99/master

Fix bug #20031