Merge pull request #15 from PMJMendes/develop

more tests