Fixed conflicts from merge.
Merge pull request #153 from vreixo/issue149

Fixed conflicts from merge.