Fix for #24
Merge pull request #25 from royriojas/master

Fix for #24