remove use of flat_map
update changelog
0.5.3