tests
Merge pull request #30 from meinac/tests

tests