take factory as std::function instead of functor
Merge branch 'master' of github.com:npalko/cvs_iterator