Junits.
Merge pull request #24 from khiven/Alvaro5

Junits.