Merge pull request #146 from vreixo/issue140

Issue140