Merge pull request #3 from gerferra/fix-tests

Fixes en tests y ...
Merge pull request #1 from scala-meetup-mvd/master

Merge pull request #3 from gerferra/fix-tests