Fix #138
Merge pull request #165 from juancarlospaco/fix/138

Fix #138