Add Generator resolver
Add map combinator function
Merge branch 'resolver'
Update CHANGELOG