Merge pull request #290 from MarioVilas/master

Fixed #289