included <functional>
include <functional>
Merge branch 'master' into gh-pages