Fix #134
Merge pull request #167 from juancarlospaco/fix/134

Fix #134