cleanup, modify collection name regexp
Merge pull request #17 from sktocha/master

cleanup, modify collection name regexp