tests
Merge pull request #80 from thelmagali/master

tests