Update ff_wrapper.hpp
Update ff_wrapper.hpp
Merge remote-tracking branch 'upstream/master'