Fix bug #10
Merge pull request #15 from jdcastri/master

Fix bug #10