Merge pull request #30 from remynaps/multitest

Multitest