stash
some tests
some tests
Merge remote-tracking branch 'origin/feature/collections' into feature/collections
Merge pull request #10 from cfralick/feature/collections

More changes