Merge pull request #5 from kookster/master

add models, change collection handling, full test coverage